merge trunk
authorKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 11:05:27 +0000 (20:05 +0900)
committerKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 11:05:27 +0000 (20:05 +0900)
commitd3c1a5455471090bb7be9ecf120ec4624d1a7c46
treed9ea889f1665cc185c3d44cc753cab450fef7553
parent3c2f85604524ea4992604cfcf26fac2b1ed7dfb9
parent65294586353676e2ac35cfbba4f211df228949d9
merge trunk